diff options
author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-03-23 13:29:24 +0100 |
---|---|---|
committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-03-26 13:05:03 +0100 |
commit | 1141c3477a7565287ad7a221b87df9410fcc4c44 (patch) | |
tree | 16ae1ac7b9c9906a8ad6fe9a1e72e579da31cf71 | |
parent | 1e8ffb1124c339c89b9d460209e1d887524df455 (diff) |
Rename _previousCoroutine -> _caller.
-rw-r--r-- | src/coroutine.cpp | 12 | ||||
-rw-r--r-- | src/coroutine.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/coroutine.cpp b/src/coroutine.cpp index c42ab56..cfb2ce3 100644 --- a/src/coroutine.cpp +++ b/src/coroutine.cpp @@ -89,7 +89,7 @@ void switchStack(void* to, void** from) { _switchStackInternal(to, from); } Coroutine::Coroutine() : _stackData(0) , _stackPointer(0) - , _previousCoroutine(0) + , _caller(0) , _status(NotStarted) { // establish starting coroutine context if necessary @@ -180,16 +180,16 @@ void Coroutine::entryPoint() bool Coroutine::cont() { Q_ASSERT(_status == NotStarted || _status == Stopped); - Q_ASSERT(!_previousCoroutine); + Q_ASSERT(!_caller); if (!_stackPointer) createStack(); _status = Running; - _previousCoroutine = *qt_currentCoroutine.localData(); + _caller = *qt_currentCoroutine.localData(); *qt_currentCoroutine.localData() = this; - switchStack(_stackPointer, &_previousCoroutine->_stackPointer); + switchStack(_stackPointer, &_caller->_stackPointer); return _status != Terminated; } @@ -210,10 +210,10 @@ void Coroutine::yieldHelper(Status stopStatus) Q_ASSERT(stoppingCoroutine->_status == Running); stoppingCoroutine->_status = stopStatus; - Coroutine *continuingCoroutine = stoppingCoroutine->_previousCoroutine; + Coroutine *continuingCoroutine = stoppingCoroutine->_caller; Q_ASSERT(continuingCoroutine); - stoppingCoroutine->_previousCoroutine = 0; + stoppingCoroutine->_caller = 0; *qt_currentCoroutine.localData() = continuingCoroutine; switchStack(continuingCoroutine->_stackPointer, &stoppingCoroutine->_stackPointer); } diff --git a/src/coroutine.h b/src/coroutine.h index 5beb274..87a448a 100644 --- a/src/coroutine.h +++ b/src/coroutine.h @@ -28,7 +28,7 @@ public: static Coroutine *currentCoroutine(); #ifdef qdoc - static Coroutine* build(Function function, ...); + static Coroutine *build(Function function, ...); #endif // add declarations for static build(...) function #include "coroutinebuilddeclaration_p.h" @@ -46,7 +46,7 @@ private: void *_stackData; void *_stackPointer; - Coroutine *_previousCoroutine; + Coroutine *_caller; Status _status; }; |